pageIndicators: Use Clutter.Orientation as orientation parameter

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/559

diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
index 2f66c240a0e1ce5829d2799bfd220f4ee8ecef38..d7a6999b2a61939df6dd354c079c80d658c921d7 100644 (file)
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -906,7 +906,9 @@ var EmojiSelection = GObject.registerClass({
         });
         this.add(this._emojiPager, { expand: true });
 
-        this._pageIndicator = new PageIndicators.PageIndicators(false);
+        this._pageIndicator = new PageIndicators.PageIndicators(
+            Clutter.Orientation.HORIZONTAL
+        );
         this.add(this._pageIndicator, { expand: true, x_fill: false, y_fill: false });
         this._pageIndicator.setReactive(false);
 

diff --git a/js/ui/pageIndicators.js b/js/ui/pageIndicators.js
index 8d81fd0f34cd5506114d7819526908ad0594f4ed..5ed7f879d0426153ce2ab25342c19e0b9371df0e 100644 (file)
--- a/js/ui/pageIndicators.js
+++ b/js/ui/pageIndicators.js
@@ -20,14 +20,17 @@ var ANIMATION_DELAY = 100;
 var PageIndicators = GObject.registerClass({
     Signals: { 'page-activated': { param_types: [GObject.TYPE_INT] } }
 }, class PageIndicators extends St.BoxLayout {
-    _init(vertical = true) {
-        super._init({ style_class: 'page-indicators',
-                      vertical,
-                      x_expand: true, y_expand: true,
-                      x_align: vertical ? Clutter.ActorAlign.END : Clutter.ActorAlign.CENTER,
-                      y_align: vertical ? Clutter.ActorAlign.CENTER : Clutter.ActorAlign.END,
-                      reactive: true,
-                      clip_to_allocation: true });
+    _init(orientation = Clutter.Orientation.VERTICAL) {
+        let vertical = orientation == Clutter.Orientation.VERTICAL;
+        super._init({
+            style_class: 'page-indicators',
+            vertical,
+            x_expand: true, y_expand: true,
+            x_align: vertical ? Clutter.ActorAlign.END : Clutter.ActorAlign.CENTER,
+            y_align: vertical ? Clutter.ActorAlign.CENTER : Clutter.ActorAlign.END,
+            reactive: true,
+            clip_to_allocation: true
+        });
         this._nPages = 0;
         this._currentPage = undefined;
         this._reactive = true;
@@ -93,7 +96,7 @@ var PageIndicators = GObject.registerClass({
 var AnimatedPageIndicators = GObject.registerClass(
 class AnimatedPageIndicators extends PageIndicators {
     _init() {
-        super._init(true);
+        super._init();
 
         this.connect('notify::mapped', () => {
             if (!this.mapped)